Initsystem (Linux): Detect version of shepherd. #1932
Conversation
| // The first line in the output might not contain the version | ||
| if (!ffStrbufStartsWithS(&result->version, "shepherd")) | ||
| ffStrbufSubstrAfterFirstC(&result->version, '\n'); | ||
|
|
There was a problem hiding this comment.
This skips over the warning about missing signalfd support on Hurd
There was a problem hiding this comment.
If shepherd version always comes at the end, I prefer ffStrbufSubstrAfterLastC(&result->version, ' ');
There was a problem hiding this comment.
There is some licensing information in the lines afterwards that I ommitted.
shepherd --version
shepherd (GNU Shepherd) 1.0.6
Copyright (C) 2025 the Shepherd authors
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
yelninei
force-pushed
the
dev
branch
2 times, most recently
from
d0752b2 to
68bd10f
Compare
|
the loop is missing error checking when there is no |
| // guile --no-auto-compile shepherd | ||
| // find the shepherd script in /proc/1/cmdline | ||
| const char* tmp = result->exe.chars; | ||
| while(!ffStrbufEndsWithS(&result->exe, "/shepherd")) |
There was a problem hiding this comment.
In addition, as what I said before, you should search for /path/to/shepherd, instead of assuming it's the 2nd argument
this iterates the args until it finds the one that points to the script.
Or what else did you mean by your previous comment?
|
Please upload the content of |
On hurd the cmdline is the same (just with different gnu/store paths) |
|
Please test if 7a87638 works for you |
|
Thanks, it works for me. Shepherd is detected correctly as init (correct name, exe and version) on
|
Linux:
[ { "type": "InitSystem", "result": { "name": "shepherd", "exe": "/gnu/store/zj0fawhffs6h1vcxi8djanjvhjas2v5l-shepherd-1.0.6/bin/shepherd", "version": "1.0.6", "pid": 1 } }, { "type": "Kernel", "result": { "architecture": "x86_64", "name": "Linux", "release": "6.15.9", "version": "#1 SMP PREEMPT_DYNAMIC 1", "displayVersion": "", "pageSize": 4096 } } ]Hurd:
[ { "type": "InitSystem", "result": { "name": "shepherd", "exe": "/gnu/store/zzlrf6iy7rwq2fs6kl99jhmfa5dbfxcx-shepherd-1.0.6/bin/shepherd", "version": "1.0.6", "pid": 1 } }, { "type": "Kernel", "result": { "architecture": "i686-AT386", "name": "GNU", "release": "0.9", "version": "GNU-Mach 1.8/Hurd-0.9", "displayVersion": "", "pageSize": 4096 } } ]